Merge pull request #816 from cantino/bump_weibo_2
bump weibo_2 due to a security issue with rest-client
Andrew Cantino
2 changed files with 26 additions and 10 deletions
+ 3
- 1
Gemfile
@@ -8,13 +8,15 @@ gem 'net-ftp-list', '~> 3.2.8' # FtpsiteAgent |
||
| 8 | 8 |
gem 'wunderground', '~> 1.2.0' # WeatherAgent |
| 9 | 9 |
gem 'forecast_io', '~> 2.0.0' # WeatherAgent |
| 10 | 10 |
gem 'rturk', '~> 2.12.1' # HumanTaskAgent |
| 11 |
-gem 'weibo_2', '~> 0.1' # Weibo Agents |
|
| 12 | 11 |
gem 'hipchat', '~> 1.2.0' # HipchatAgent |
| 13 | 12 |
gem 'xmpp4r', '~> 0.5.6' # JabberAgent |
| 14 | 13 |
gem 'mqtt' # MQTTAgent |
| 15 | 14 |
gem 'slack-notifier', '~> 1.0.0' # SlackAgent |
| 16 | 15 |
gem 'hypdf', '~> 1.0.7' # PDFInfoAgent |
| 17 | 16 |
|
| 17 |
+# Weibo Agents |
|
| 18 |
+gem 'weibo_2', github: 'cantino/weibo_2', branch: 'master' |
|
| 19 |
+ |
|
| 18 | 20 |
# GoogleCalendarPublishAgent |
| 19 | 21 |
gem "google-api-client", require: 'google/api_client' |
| 20 | 22 |
|
+ 23
- 9
Gemfile.lock
@@ -9,6 +9,17 @@ GIT |
||
| 9 | 9 |
simple_oauth (~> 0.3.0) |
| 10 | 10 |
|
| 11 | 11 |
GIT |
| 12 |
+ remote: git://github.com/cantino/weibo_2.git |
|
| 13 |
+ revision: 00e57d29d8252126014b038cd738b02e05e4cfc5 |
|
| 14 |
+ branch: master |
|
| 15 |
+ specs: |
|
| 16 |
+ weibo_2 (0.1.7) |
|
| 17 |
+ hashie (~> 2.0.4) |
|
| 18 |
+ multi_json (~> 1) |
|
| 19 |
+ oauth2 (~> 0.9.1) |
|
| 20 |
+ rest-client (~> 1.8) |
|
| 21 |
+ |
|
| 22 |
+GIT |
|
| 12 | 23 |
remote: git://github.com/wunderlist/omniauth-wunderlist.git |
| 13 | 24 |
revision: d0910d0396107b9302aa1bc50e74bb140990ccb8 |
| 14 | 25 |
ref: d0910d0396107b9302aa1bc50e74bb140990ccb8 |
@@ -111,6 +122,8 @@ GEM |
||
| 111 | 122 |
warden (~> 1.2.3) |
| 112 | 123 |
diff-lcs (1.2.5) |
| 113 | 124 |
docile (1.1.5) |
| 125 |
+ domain_name (0.5.24) |
|
| 126 |
+ unf (>= 0.0.5, < 1.0.0) |
|
| 114 | 127 |
dotenv (0.11.1) |
| 115 | 128 |
dotenv-deployment (~> 0.0.2) |
| 116 | 129 |
dotenv-deployment (0.0.2) |
@@ -201,6 +214,8 @@ GEM |
||
| 201 | 214 |
multipart-post |
| 202 | 215 |
http (0.6.4) |
| 203 | 216 |
http_parser.rb (~> 0.6.0) |
| 217 |
+ http-cookie (1.0.2) |
|
| 218 |
+ domain_name (~> 0.5) |
|
| 204 | 219 |
http_parser.rb (0.6.0) |
| 205 | 220 |
httparty (0.13.1) |
| 206 | 221 |
json (~> 1.8) |
@@ -214,7 +229,7 @@ GEM |
||
| 214 | 229 |
json (1.8.2) |
| 215 | 230 |
jsonpath (0.5.6) |
| 216 | 231 |
multi_json |
| 217 |
- jwt (1.3.0) |
|
| 232 |
+ jwt (1.4.1) |
|
| 218 | 233 |
kaminari (0.16.1) |
| 219 | 234 |
actionpack (>= 3.0.0) |
| 220 | 235 |
activesupport (>= 3.0.0) |
@@ -290,7 +305,7 @@ GEM |
||
| 290 | 305 |
slop (~> 3.4) |
| 291 | 306 |
quiet_assets (1.1.0) |
| 292 | 307 |
railties (>= 3.1, < 5.0) |
| 293 |
- rack (1.6.0) |
|
| 308 |
+ rack (1.6.1) |
|
| 294 | 309 |
rack-test (0.6.3) |
| 295 | 310 |
rack (>= 1.0) |
| 296 | 311 |
rails (4.2.1) |
@@ -330,7 +345,8 @@ GEM |
||
| 330 | 345 |
ref (1.0.5) |
| 331 | 346 |
responders (2.1.0) |
| 332 | 347 |
railties (>= 4.2.0, < 5) |
| 333 |
- rest-client (1.7.3) |
|
| 348 |
+ rest-client (1.8.0) |
|
| 349 |
+ http-cookie (>= 1.0.2, < 2.0) |
|
| 334 | 350 |
mime-types (>= 1.16, < 3.0) |
| 335 | 351 |
netrc (~> 0.7) |
| 336 | 352 |
retriable (2.0.2) |
@@ -453,6 +469,9 @@ GEM |
||
| 453 | 469 |
uglifier (2.7.0) |
| 454 | 470 |
execjs (>= 0.3.0) |
| 455 | 471 |
json (>= 1.8.0) |
| 472 |
+ unf (0.1.4) |
|
| 473 |
+ unf_ext |
|
| 474 |
+ unf_ext (0.0.7.1) |
|
| 456 | 475 |
unicorn (4.8.3) |
| 457 | 476 |
kgio (~> 2.6) |
| 458 | 477 |
rack |
@@ -466,11 +485,6 @@ GEM |
||
| 466 | 485 |
webmock (1.17.4) |
| 467 | 486 |
addressable (>= 2.2.7) |
| 468 | 487 |
crack (>= 0.3.2) |
| 469 |
- weibo_2 (0.1.7) |
|
| 470 |
- hashie (~> 2.0.4) |
|
| 471 |
- multi_json (~> 1) |
|
| 472 |
- oauth2 (~> 0.9.1) |
|
| 473 |
- rest-client (~> 1.7.3) |
|
| 474 | 488 |
wunderground (1.2.0) |
| 475 | 489 |
addressable |
| 476 | 490 |
httparty (> 0.6.0) |
@@ -566,6 +580,6 @@ DEPENDENCIES |
||
| 566 | 580 |
unicorn |
| 567 | 581 |
vcr |
| 568 | 582 |
webmock (~> 1.17.4) |
| 569 |
- weibo_2 (~> 0.1) |
|
| 583 |
+ weibo_2! |
|
| 570 | 584 |
wunderground (~> 1.2.0) |
| 571 | 585 |
xmpp4r (~> 0.5.6) |